Repository navigation
gh-160561: Fix race in test_socket testFromFdError - #160930
Merged
Merged
Conversation
The client thread closes its socket in clientTearDown() concurrently with the server-side test, so the process-wide fd count could drop between the two os_helper.fd_count() calls. Wait for the client thread to finish before taking the first count. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
asvetlov
added
skip news
needs backport to 3.14
|
Thanks @asvetlov for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14, 3.15. |
|
GH-160955 is a backport of this pull request to the 3.15 branch. |
|
GH-160956 is a backport of this pull request to the 3.14 branch. |
asvetlov
added a commit
that referenced
this pull request
Oct 30, 2026
…#160956) gh-160561: Fix race in test_socket testFromFdError (GH-160930) The client thread closes its socket in clientTearDown() concurrently with the server-side test, so the process-wide fd count could drop between the two os_helper.fd_count() calls. Wait for the client thread to finish before taking the first count. (cherry picked from commit af79f49) Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
asvetlov
added a commit
that referenced
this pull request
Oct 30, 2026
…#160955) gh-160561: Fix race in test_socket testFromFdError (GH-160930) The client thread closes its socket in clientTearDown() concurrently with the server-side test, so the process-wide fd count could drop between the two os_helper.fd_count() calls. Wait for the client thread to finish before taking the first count. (cherry picked from commit af79f49) Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
testFromFdError(added in gh-160579) compares the process-wide fd count before and after a few rejectedsocket.fromfd()calls. InBasicTCPTest/BasicTCPTest2the client thread runs concurrently and closes its socket inclientTearDown(); if that happens between the twofd_count()calls the test fails withAssertionError: 6 != 7. This was seen on the TSan (free-threading) job, e.g. https://github.com/python/cpython/actions/runs/40931791099/job/123724957337.Wait on
self.done(set at the end ofclientTearDown()) before the first count, ascheck_shutdown()already does.Verified by forcing the race (delaying the client thread and
fromfd()): the old test fails with the same off-by-one, the new one passes.test_socketpasses.Needs backport to 3.15 and 3.14 together with gh-160579.
🤖 Generated with Claude Code